megacmd: add ffmpeg and freeimage support; add darwin support #362308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
10.rebuild-darwin: 0
ofborg
bot
added
11.by: package-maintainer
|
Do we know exactly what features including ffmpeg and freeimage enables? |
|
FFmpeg is for video preview/thumbnail generation, and FreeImage is for image preview/thumbnail generation. Don't know how these features are relevant to a CLI app but there they are. |
This is truly curious. Help needed. |
|
Is forcing GCC instead of Clang necessary to fix something or demanded by upstream, or would using the default be fine? The following builds just fine with the regular diff --git a/pkgs/by-name/me/megacmd/fix-darwin.patch b/pkgs/by-name/me/megacmd/fix-darwin.patch
index 12f0733f91a1..e46d8d99b9b4 100644
--- a/pkgs/by-name/me/megacmd/fix-darwin.patch
+++ b/pkgs/by-name/me/megacmd/fix-darwin.patch
@@ -6,7 +6,7 @@
+if DARWIN
+AM_LIBTOOLFLAGS="--tag=CXX"
-+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
++AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/osx -I$(top_srcdir)/include/mega/osx
+endif
+
if WIN32
@@ -25,7 +25,7 @@
+if DARWIN
+AM_LIBTOOLFLAGS="--tag=CXX"
-+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
++AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/osx -I$(top_srcdir)/include/mega/osx
+endif
+
if WIN32
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index 53a5159e7cc8..59acd25766d1 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -8,7 +8,6 @@
fetchFromGitHub,
ffmpeg,
freeimage,
- gcc-unwrapped,
icu,
libmediainfo,
libraw,
@@ -19,7 +18,6 @@
pkg-config,
readline,
sqlite,
- darwin,
withFreeImage ? false, # default to false because freeimage is insecure
}:
@@ -58,10 +56,9 @@ stdenv.mkDerivation {
[
c-ares
cryptopp
- curl.dev
+ curl
ffmpeg
icu
- gcc-unwrapped
libmediainfo
libraw
libsodium
@@ -72,16 +69,7 @@ stdenv.mkDerivation {
sqlite
]
++ lib.optionals withFreeImage [ freeimage ]
- ++ lib.optionals stdenv.isDarwin (
- with darwin.apple_sdk.frameworks;
- [
- CoreFoundation
- CoreServices
- SystemConfiguration
- Cocoa
- DiskArbitration
- ]
- );
+ ;
configureFlags = [
"--disable-curl-checks"
|
UlyssesZh
force-pushed
the
megacmd-darwin
branch
from
6f8edf7 to
4de846c
Compare
UlyssesZh
force-pushed
the
megacmd-darwin
branch
from
4de846c to
7c87ea1
Compare
|
Thank you @OPNA2608. I got it working. It seems that |
donovanglover
added
the
12.approvals: 1
lunik1
approved these changes
Jan 2, 2025
wegank
added
12.approved-by: package-maintainer
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add FFmpeg support via a patch. Add FreeImage support optionally (user can risk the insecurity by overriding an argument). Add Darwin support.
Closes #297586.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.